Do not call gtk_widget_set_parent_window(), using widget->window instead

2008-04-10  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtknotebook.c (hide_drag_window): Do not call
        gtk_widget_set_parent_window(), using widget->window instead of NULL
        to unset is the wrong thing, and gtk_widget_unparent() will already
        take care of this (#467698, patch by Sébastien Granjoux)

svn path=/trunk/; revision=19987

diff --git a/ChangeLog b/ChangeLog
index 4e4d300a98f696394461cb0d88590ce46578198c..0b23a91b18046751875cf3a8ee338bb798580292 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-10  Carlos Garnacho  <carlos@imendio.com>
+
+       * gtk/gtknotebook.c (hide_drag_window): Do not call
+       gtk_widget_set_parent_window(), using widget->window instead of NULL
+       to unset is the wrong thing, and gtk_widget_unparent() will already 
+       take care of this (#467698, patch by Sébastien Granjoux)
+
 2008-04-08  Tor Lillqvist  <tml@novell.com>
 
        * demos/gtk-demo/builder.c (quit_activate, about_activate): Mark

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 2a9d84ac3bf358e27241af92fb2b2d5d8eba2923..3bce620c83e5204da7339a72aff25d81758e46f8 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2730,7 +2730,6 @@ hide_drag_window (GtkNotebook        *notebook,
       else
        gtk_widget_unparent (page->tab_label);
 
-      gtk_widget_set_parent_window (page->tab_label, widget->window);
       gtk_widget_set_parent (page->tab_label, widget);
       g_object_unref (page->tab_label);
     }